From 5554ea218bc2b7b43fa0a47486cfd1ceab759edf Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Fri, 1 Nov 2002 02:45:10 +0000
Subject: [PATCH] GPX: Don't emit name and descr if we don't have them.
 magproto: remove debug msg gpsread: alleged fix for banana.

---
 gpsbabel/gpx.c           | 17 +++++++++++------
 gpsbabel/jeeps/gpsread.c |  2 +-
 gpsbabel/magproto.c      |  1 -
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index dacf8cebb..5f332fe99 100644
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -299,16 +299,21 @@ gpx_write_time(const time_t timep)
 static void
 gpx_waypt_pr(const waypoint *waypointp)
 {
+	const char *oname = global_opts.synthesize_shortnames ?
+				  mkshort(waypointp->description) : 
+				  waypointp->shortname;
 
 	fprintf(ofd, "<wpt lat=\"%lf\" lon=\"%lf\">\n",
 		waypointp->position.latitude.degrees,
 		waypointp->position.longitude.degrees);
-	fprintf(ofd, "<name>%s</name>\n", global_opts.synthesize_shortnames ?
-				          mkshort(waypointp->description) : 
-					  waypointp->shortname);
-	fprintf(ofd, "<desc>");
-	fprintf(ofd, "<![CDATA[%s]]>", waypointp->description);
-	fprintf(ofd, "</desc>\n");
+	if (oname) {
+		fprintf(ofd, "<name>%s</name>\n", oname);
+	}
+	if (waypointp->description) {
+		fprintf(ofd, "<desc>");
+		fprintf(ofd, "<![CDATA[%s]]>", waypointp->description);
+		fprintf(ofd, "</desc>\n");
+	}
 	if (waypointp->position.altitude.altitude_meters) {
 		fprintf(ofd, "<ele>\n%f\n</ele>\n",
 			 waypointp->position.altitude.altitude_meters);
diff --git a/gpsbabel/jeeps/gpsread.c b/gpsbabel/jeeps/gpsread.c
index a645d8975..e7af43b9a 100644
--- a/gpsbabel/jeeps/gpsread.c
+++ b/gpsbabel/jeeps/gpsread.c
@@ -193,7 +193,7 @@ int32 GPS_Get_Ack(int32 fd, GPS_PPacket *tra, GPS_PPacket *rec)
     if(LINK_ID[0].Pid_Ack_Byte != (*rec)->type)
     {
 	gps_error = FRAMING_ERROR;
-	return 0;
+/* rjl	return 0; */
     }
     
     if(*(*rec)->data != (*tra)->type)
diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index 1e83489ba..f486308df 100644
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -657,7 +657,6 @@ mag_trkparse(char *trkmsg)
 
 	waypt  = xcalloc(sizeof *waypt, 1);
 
-	printf("%s\n", trkmsg);
 	memset(&tm, 0, sizeof(tm));
 
 	sscanf(trkmsg,"$PMGNTRK,%lf,%c,%lf,%c,%d,%c,%d.%d,A,,%d", 
-- 
2.30.2